From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 2 May 2016 01:07:56 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~3053
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b57c1741abfb95da1dc6c165339551daff2ca3e1;p=emacs.git

Merge from origin/emacs-25

5a952eb Don't mention ~/.emacs.bmk literally in doc strings
c338cf3 * etc/NEWS: Explain why multicolor font display is disabled o...
c30d1b4 Port to Ubuntu 16.04 --enable-gcc-warnings
---

b57c1741abfb95da1dc6c165339551daff2ca3e1